From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 24 Jun 2013 21:15:33 +0000 (-0400)
Subject: osdWindow: Make sure to clear the hide timeout
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4015
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bc069b99ecb7c4f918fe5b710d25c5a8450aa4a2;p=gnome-shell.git

osdWindow: Make sure to clear the hide timeout

When the osd window is hidden based on the timeout, it accidentally
left the timeout ID in place. When a subsequent switcher popup came
up, it thought the OSD window was scheduled to be hidden and tried
to re-hide the actor. This caused the tween to be run along with
an extra call to enable_unredirect_for_screen.
---

diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js
index f59c84c64..bb7d88894 100644
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -158,11 +158,11 @@ const OsdWindow = new Lang.Class({
             return;
 
         Mainloop.source_remove(this._hideTimeoutId);
-        this._hideTimeoutId = 0;
         this._hide();
     },
 
     _hide: function() {
+        this._hideTimeoutId = 0;
         Tweener.addTween(this.actor,
                          { opacity: 0,
                            time: FADE_TIME,